+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
+Thu Jan 17 13:08:34 2002 Owen Taylor <otaylor@redhat.com>
+
+ * gdk/x11/gdkmain-x11.c (gdk_error_trap_push): Move
+ here, and save/restore the X error handler to allow
+ people using GTK+ to set the X error handler to something
+ custom without disturbing the operation of GDK.
+
+ * gdk/linux-fb/gdkmain-fb.c (gdk_error_trap_push)
+ * gdk/win32/gdkmain-win32.c (gdk_error_trap_pop): Add
+ dummy implementations.
+
+ * gdk/x11/gdkmain-x11.c gdk/x11/gdkevents-x11.c
+ gdk/x11/gdkdnd-x11.c: Use gdk_error_trap_push()/pop()
+ for all error trapping.
+
+ * gdk/x11/gdkdnd-x11.c: Remove '#if 0' code.
+
+ * gdk/x11/gdkdnd-x11.c (gdk_window_cache_new): Fix
+ problem where we would add the results anyways,
+ and then add it again if no error occurred, and problem
+ where we could leave _gdk_error_warnings() unset.
+
Wed Jan 16 20:28:38 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkfilesel.c: Fix "deleting" filename by adding
#endif
typedef struct _GdkPredicate GdkPredicate;
-typedef struct _GdkErrorTrap GdkErrorTrap;
struct _GdkPredicate
{
gpointer data;
};
-struct _GdkErrorTrap
-{
- gint error_warnings;
- gint error_code;
-};
-
/* Private variable declarations
*/
static int gdk_initialized = 0; /* 1 if the library is initialized,
* 0 otherwise.
*/
-static GSList *gdk_error_traps = NULL; /* List of error traps */
static GSList *gdk_error_trap_free_list = NULL; /* Free list */
static gchar *gdk_progclass = NULL;
#endif
-/*************************************************************
- * gdk_error_trap_push:
- * Push an error trap. X errors will be trapped until
- * the corresponding gdk_error_pop(), which will return
- * the error code, if any.
- * arguments:
- *
- * results:
- *************************************************************/
-
-void
-gdk_error_trap_push (void)
-{
- GSList *node;
- GdkErrorTrap *trap;
-
- if (gdk_error_trap_free_list)
- {
- node = gdk_error_trap_free_list;
- gdk_error_trap_free_list = gdk_error_trap_free_list->next;
- }
- else
- {
- node = g_slist_alloc ();
- node->data = g_new (GdkErrorTrap, 1);
- }
-
- node->next = gdk_error_traps;
- gdk_error_traps = node;
-
- trap = node->data;
- trap->error_code = _gdk_error_code;
- trap->error_warnings = _gdk_error_warnings;
-
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
-}
-
-/*************************************************************
- * gdk_error_trap_pop:
- * Pop an error trap added with gdk_error_push()
- * arguments:
- *
- * results:
- * 0, if no error occured, otherwise the error code.
- *************************************************************/
-
-gint
-gdk_error_trap_pop (void)
-{
- GSList *node;
- GdkErrorTrap *trap;
- gint result;
-
- g_return_val_if_fail (gdk_error_traps != NULL, 0);
-
- node = gdk_error_traps;
- gdk_error_traps = gdk_error_traps->next;
-
- node->next = gdk_error_trap_free_list;
- gdk_error_trap_free_list = node;
-
- result = _gdk_error_code;
-
- trap = node->data;
- _gdk_error_code = trap->error_code;
- _gdk_error_warnings = trap->error_warnings;
-
- return result;
-}
-
void
gdk_threads_enter ()
{
#endif
}
+void
+gdk_error_trap_push (void)
+{
+}
+
+gint
+gdk_error_trap_pop (void)
+{
+ return 0;
+}
{
return "Win32";
}
+
+void
+gdk_error_trap_push (void)
+{
+}
+
+gint
+gdk_error_trap_pop (void)
+{
+ return 0;
+}
unsigned int nchildren;
int i;
- gint old_warnings = _gdk_error_warnings;
-
GdkWindowCache *result = g_new (GdkWindowCache, 1);
result->children = NULL;
result->old_event_mask | SubstructureNotifyMask);
gdk_window_add_filter (_gdk_parent_root,
gdk_window_cache_filter, result);
-
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
- if (XQueryTree(gdk_display, _gdk_root_window,
- &root, &parent, &children, &nchildren) == 0)
- return result;
+ gdk_error_trap_push ();
+
+ if (!XQueryTree(gdk_display, _gdk_root_window,
+ &root, &parent, &children, &nchildren))
+ {
+ gdk_error_trap_pop ();
+ return result;
+ }
for (i = 0; i < nchildren ; i++)
{
- XGetWindowAttributes (gdk_display, children[i], &xwa);
-
- gdk_window_cache_add (result, children[i],
- xwa.x, xwa.y, xwa.width, xwa.height,
- xwa.map_state != IsUnmapped);
-
- if (_gdk_error_code)
- _gdk_error_code = 0;
- else
- {
- gdk_window_cache_add (result, children[i],
- xwa.x, xwa.y, xwa.width, xwa.height,
- (xwa.map_state != IsUnmapped));
- }
+ if (XGetWindowAttributes (gdk_display, children[i], &xwa))
+ gdk_window_cache_add (result, children[i],
+ xwa.x, xwa.y, xwa.width, xwa.height,
+ xwa.map_state != IsUnmapped);
}
XFree (children);
-
- _gdk_error_warnings = old_warnings;
+ gdk_error_trap_pop ();
return result;
}
if (!wm_state_atom)
wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE");
- XGetWindowProperty (gdk_display, win,
- wm_state_atom, 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &after, &data);
-
- if (_gdk_error_code)
- {
- _gdk_error_code = 0;
-
- return None;
- }
+ if (XGetWindowProperty (gdk_display, win,
+ wm_state_atom, 0, 0, False, AnyPropertyType,
+ &type, &format, &nitems, &after, &data) != Success)
+ return None;
if (type != None)
{
#if 0
/* This is beautiful! Damn Enlightenment and click-to-focus */
- XTranslateCoordinates (gdk_display, _gdk_root_window, win,
- x_root, y_root, &dest_x, &dest_y, &child);
-
- if (_gdk_error_code)
- {
- _gdk_error_code = 0;
-
- return None;
- }
+ if (!XTranslateCoordinates (gdk_display, _gdk_root_window, win,
+ x_root, y_root, &dest_x, &dest_y, &child))
+ return None;
#else
- if (XQueryTree(gdk_display, win,
- &root, &tmp_parent, &children, &nchildren) == 0)
+ if (!XQueryTree(gdk_display, win,
+ &root, &tmp_parent, &children, &nchildren))
return 0;
-
- if (!_gdk_error_code)
+
+ for (i = nchildren - 1; (i >= 0) && (child == None); i--)
{
- for (i = nchildren - 1; (i >= 0) && (child == None); i--)
+ XWindowAttributes xwa;
+
+ if (XGetWindowAttributes (gdk_display, children[i], &xwa))
{
- XWindowAttributes xwa;
-
- XGetWindowAttributes (gdk_display, children[i], &xwa);
-
- if (_gdk_error_code)
- _gdk_error_code = 0;
- else if ((xwa.map_state == IsViewable) && (xwa.class == InputOutput) &&
- (x >= xwa.x) && (x < xwa.x + (gint)xwa.width) &&
- (y >= xwa.y) && (y < xwa.y + (gint)xwa.height))
+ if ((xwa.map_state == IsViewable) && (xwa.class == InputOutput) &&
+ (x >= xwa.x) && (x < xwa.x + (gint)xwa.width) &&
+ (y >= xwa.y) && (y < xwa.y + (gint)xwa.height))
{
x -= xwa.x;
y -= xwa.y;
child = children[i];
}
}
-
- XFree (children);
}
- else
- _gdk_error_code = 0;
+
+ XFree (children);
#endif
if (child)
GList *tmp_list;
Window retval = None;
- gint old_warnings = _gdk_error_warnings;
+ gdk_error_trap_push ();
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
-
tmp_list = cache->children;
while (tmp_list && !retval)
tmp_list = tmp_list->next;
}
- _gdk_error_warnings = old_warnings;
- if (retval)
- return retval;
- else
- return _gdk_root_window;
-}
-
-#if 0
-static Window
-get_client_window_at_coords_recurse (Window win,
- gint x_root,
- gint y_root)
-{
- Window child;
- Atom type = None;
- int format;
- unsigned long nitems, after;
- unsigned char *data;
- int dest_x, dest_y;
-
- static Atom wm_state_atom = None;
-
- if (!wm_state_atom)
- wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE");
-
- XGetWindowProperty (gdk_display, win,
- wm_state_atom, 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &after, &data);
-
- if (_gdk_error_code)
- {
- _gdk_error_code = 0;
-
- return None;
- }
-
- if (type != None)
- {
- XFree (data);
- return win;
- }
-
- XTranslateCoordinates (gdk_display, _gdk_root_window, win,
- x_root, y_root, &dest_x, &dest_y, &child);
-
- if (_gdk_error_code)
- {
- _gdk_error_code = 0;
-
- return None;
- }
-
- if (child)
- return get_client_window_at_coords_recurse (child, x_root, y_root);
- else
- return None;
-}
-
-static Window
-get_client_window_at_coords (Window ignore,
- gint x_root,
- gint y_root)
-{
- Window root, parent, *children;
- unsigned int nchildren;
- int i;
- Window retval = None;
+ gdk_error_trap_pop ();
- gint old_warnings = _gdk_error_warnings;
-
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
-
- if (XQueryTree(gdk_display, _gdk_root_window,
- &root, &parent, &children, &nchildren) == 0)
- return 0;
-
- for (i = nchildren - 1; (i >= 0) && (retval == None); i--)
- {
- if (children[i] != ignore)
- {
- XWindowAttributes xwa;
-
- XGetWindowAttributes (gdk_display, children[i], &xwa);
-
- if (_gdk_error_code)
- _gdk_error_code = 0;
- else if ((xwa.map_state == IsViewable) &&
- (x_root >= xwa.x) && (x_root < xwa.x + (gint)xwa.width) &&
- (y_root >= xwa.y) && (y_root < xwa.y + (gint)xwa.height))
- {
- retval = get_client_window_at_coords_recurse (children[i],
- x_root, y_root);
- if (!retval)
- retval = children[i];
- }
- }
- }
-
- XFree (children);
-
- _gdk_error_warnings = old_warnings;
if (retval)
return retval;
else
return _gdk_root_window;
}
-#endif
/*************************************************************
***************************** MOTIF *************************
Window proxy;
static Atom xdnd_proxy_atom = None;
- gint old_warnings = _gdk_error_warnings;
-
if (!xdnd_proxy_atom)
xdnd_proxy_atom = gdk_x11_get_xatom_by_name ("XdndProxy");
xdnd_aware_atom = gdk_x11_get_xatom_by_name ("XdndAware");
proxy = None;
-
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
- XGetWindowProperty (gdk_display, win,
- xdnd_proxy_atom, 0,
- 1, False, AnyPropertyType,
- &type, &format, &nitems, &after,
- (guchar **)&proxy_data);
-
- if (!_gdk_error_code)
+ gdk_error_trap_push ();
+
+ if (XGetWindowProperty (gdk_display, win,
+ xdnd_proxy_atom, 0,
+ 1, False, AnyPropertyType,
+ &type, &format, &nitems, &after,
+ (guchar **)&proxy_data) == Success)
{
if (type != None)
{
XFree (proxy_data);
}
- XGetWindowProperty (gdk_display, proxy ? proxy : win,
- xdnd_aware_atom, 0,
- 1, False, AnyPropertyType,
- &type, &format, &nitems, &after,
- (guchar **)&version);
-
- if (!_gdk_error_code && type != None)
+ if ((XGetWindowProperty (gdk_display, proxy ? proxy : win,
+ xdnd_aware_atom, 0,
+ 1, False, AnyPropertyType,
+ &type, &format, &nitems, &after,
+ (guchar **)&version) == Success) &&
+ type != None)
{
if ((format == 32) && (nitems == 1))
{
XFree (version);
}
-
}
- _gdk_error_warnings = old_warnings;
- _gdk_error_code = 0;
+ gdk_error_trap_pop ();
return retval ? (proxy ? proxy : win) : None;
}
gint i;
- gint old_warnings = _gdk_error_warnings;
-
- _gdk_error_code = 0;
- _gdk_error_warnings = 0;
-
/* Get the XdndActionList, if set */
- XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
- GDK_DRAWABLE_XID (context->source_window),
- gdk_x11_get_xatom_by_name ("XdndActionList"), 0, 65536,
- False, XA_ATOM, &type, &format, &nitems,
- &after, (guchar **)&data);
+ gdk_error_trap_push ();
- if (!_gdk_error_code && (format == 32) && (type == XA_ATOM))
+ if (XGetWindowProperty (GDK_DRAWABLE_XDISPLAY (context->source_window),
+ GDK_DRAWABLE_XID (context->source_window),
+ gdk_x11_get_xatom_by_name ("XdndActionList"), 0, 65536,
+ False, XA_ATOM, &type, &format, &nitems,
+ &after, (guchar **)&data) == Success &&
+ type == XA_ATOM)
{
context->actions = 0;
XFree(data);
}
- _gdk_error_warnings = old_warnings;
- _gdk_error_code = 0;
+ gdk_error_trap_pop ();
}
/* We have to make sure that the XdndActionList we keep internally
/* Check if this is a root window */
gboolean rootwin = FALSE;
- gint old_warnings = _gdk_error_warnings;
Atom type = None;
int format;
unsigned long nitems, after;
if (xid == _gdk_root_window)
rootwin = TRUE;
- _gdk_error_warnings = 0;
+ gdk_error_trap_push ();
if (!rootwin)
{
- _gdk_error_code = 0;
-
- XGetWindowProperty (gdk_display, xid,
- gdk_x11_get_xatom_by_name ("ENLIGHTENMENT_DESKTOP"),
- 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &after, &data);
- if ((_gdk_error_code == 0) && type != None)
+ if (XGetWindowProperty (gdk_display, xid,
+ gdk_x11_get_xatom_by_name ("ENLIGHTENMENT_DESKTOP"),
+ 0, 0, False, AnyPropertyType,
+ &type, &format, &nitems, &after, &data) == Success &&
+ type != None)
{
XFree (data);
rootwin = TRUE;
#if 0
if (!rootwin)
{
- _gdk_error_code = 0;
-
- XGetWindowProperty (gdk_display, win,
- gdk_x11_get_xatom_by_name ("__SWM_VROOT"),
- 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &data);
- if ((_gdk_error_code == 0) && type != None)
+ if (XGetWindowProperty (gdk_display, win,
+ gdk_x11_get_xatom_by_name ("__SWM_VROOT"),
+ 0, 0, False, AnyPropertyType,
+ &type, &format, &nitems, &data) &&
+ type != None)
rootwin = TRUE;
}
#endif
- _gdk_error_warnings = old_warnings;
+ gdk_error_trap_pop ();
if (rootwin)
{
unsigned char *data;
Window *ret_children, ret_root, ret_parent;
unsigned int ret_nchildren;
- gint old_warnings = _gdk_error_warnings;
gboolean send = FALSE;
gboolean found = FALSE;
+ gboolean result = FALSE;
int i;
if (!wm_state_atom)
wm_state_atom = gdk_x11_get_xatom_by_name ("WM_STATE");
- _gdk_error_warnings = FALSE;
- _gdk_error_code = 0;
- XGetWindowProperty (gdk_display, xid, wm_state_atom, 0, 0, False, AnyPropertyType,
- &type, &format, &nitems, &after, &data);
-
- if (_gdk_error_code)
- {
- _gdk_error_warnings = old_warnings;
-
- return FALSE;
- }
+ gdk_error_trap_push ();
+
+ if (XGetWindowProperty (gdk_display, xid, wm_state_atom, 0, 0, False, AnyPropertyType,
+ &type, &format, &nitems, &after, &data) != Success)
+ goto out;
if (type)
{
else
{
/* OK, we're all set, now let's find some windows to send this to */
- if (XQueryTree (gdk_display, xid, &ret_root, &ret_parent,
- &ret_children, &ret_nchildren) != True ||
- _gdk_error_code)
- {
- _gdk_error_warnings = old_warnings;
-
- return FALSE;
- }
+ if (!XQueryTree (gdk_display, xid, &ret_root, &ret_parent,
+ &ret_children, &ret_nchildren))
+ goto out;
for(i = 0; i < ret_nchildren; i++)
if (gdk_event_send_client_message_to_all_recurse (xev, ret_children[i], level + 1))
gdk_send_xevent (xid, False, NoEventMask, xev);
}
- _gdk_error_warnings = old_warnings;
+ result = send || found;
+
+ out:
+ gdk_error_trap_pop ();
- return (send || found);
+ return result;
}
void
gdk_event_send_clientmessage_toall (GdkEvent *event)
{
XEvent sev;
- gint old_warnings = _gdk_error_warnings;
g_return_if_fail(event != NULL);
sev.xclient.message_type = gdk_x11_atom_to_xatom (event->client.message_type);
gdk_event_send_client_message_to_all_recurse(&sev, _gdk_root_window, 0);
-
- _gdk_error_warnings = old_warnings;
}
/*
struct _GdkErrorTrap
{
+ int (*old_handler) (Display *, XErrorEvent *);
gint error_warnings;
gint error_code;
};
static gint autorepeat;
static gboolean gdk_synchronize = FALSE;
+static GSList *gdk_error_traps = NULL; /* List of error traps */
+static GSList *gdk_error_trap_free_list = NULL; /* Free list */
GdkArgDesc _gdk_windowing_args[] = {
{ "display", GDK_ARG_STRING, &_gdk_display_name, (GdkArgFunc)NULL },
exit(1);
}
+/*************************************************************
+ * gdk_error_trap_push:
+ * Push an error trap. X errors will be trapped until
+ * the corresponding gdk_error_pop(), which will return
+ * the error code, if any.
+ * arguments:
+ *
+ * results:
+ *************************************************************/
+
+void
+gdk_error_trap_push (void)
+{
+ GSList *node;
+ GdkErrorTrap *trap;
+
+ if (gdk_error_trap_free_list)
+ {
+ node = gdk_error_trap_free_list;
+ gdk_error_trap_free_list = gdk_error_trap_free_list->next;
+ }
+ else
+ {
+ node = g_slist_alloc ();
+ node->data = g_new (GdkErrorTrap, 1);
+ }
+
+ node->next = gdk_error_traps;
+ gdk_error_traps = node;
+
+ trap = node->data;
+ trap->old_handler = XSetErrorHandler (gdk_x_error);
+ trap->error_code = _gdk_error_code;
+ trap->error_warnings = _gdk_error_warnings;
+
+ _gdk_error_code = 0;
+ _gdk_error_warnings = 0;
+}
+
+/*************************************************************
+ * gdk_error_trap_pop:
+ * Pop an error trap added with gdk_error_push()
+ * arguments:
+ *
+ * results:
+ * 0, if no error occured, otherwise the error code.
+ *************************************************************/
+
+gint
+gdk_error_trap_pop (void)
+{
+ GSList *node;
+ GdkErrorTrap *trap;
+ gint result;
+
+ g_return_val_if_fail (gdk_error_traps != NULL, 0);
+
+ node = gdk_error_traps;
+ gdk_error_traps = gdk_error_traps->next;
+
+ node->next = gdk_error_trap_free_list;
+ gdk_error_trap_free_list = node;
+
+ result = _gdk_error_code;
+
+ trap = node->data;
+ _gdk_error_code = trap->error_code;
+ _gdk_error_warnings = trap->error_warnings;
+ XSetErrorHandler (trap->old_handler);
+
+ return result;
+}
+
gchar *
gdk_get_display (void)
{
gdk_send_xevent (Window window, gboolean propagate, glong event_mask,
XEvent *event_send)
{
- Status result;
- gint old_warnings = _gdk_error_warnings;
+ gboolean result;
- _gdk_error_code = 0;
-
- _gdk_error_warnings = 0;
+ gdk_error_trap_push ();
result = XSendEvent (gdk_display, window, propagate, event_mask, event_send);
XSync (gdk_display, False);
- _gdk_error_warnings = old_warnings;
- return result && !_gdk_error_code;
+ return result && gdk_error_trap_pop() == Success;
}
void
projects / gtk4.git / commitdiff